From dece0189945d1d6c16f362be76d1c70f00ecc9ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Sat, 15 Oct 2016 17:43:56 +0200 Subject: [PATCH] Remove GtkAlignment --- docs/reference/gtk/gtk4-sections.txt | 21 - docs/tools/widgets.c | 198 ++-- gtk/a11y/gtkbuttonaccessible.c | 4 - gtk/a11y/gtkwidgetaccessible.c | 14 +- gtk/deprecated/Makefile.inc | 2 - gtk/deprecated/gtkalignment.c | 884 ------------------ gtk/deprecated/gtkalignment.h | 107 --- gtk/gtk.h | 1 - gtk/gtktoolitemgroup.c | 50 +- gtk/gtktreeviewcolumn.c | 33 +- tests/testadjustsize.c | 32 - tests/testheightforwidth.c | 11 +- testsuite/gtk/builder.c | 1 - testsuite/gtk/notify.c | 5 - testsuite/reftests/Makefile.am | 3 - testsuite/reftests/alignment-props.css | 8 - testsuite/reftests/alignment-props.ref.ui | 181 ---- testsuite/reftests/alignment-props.ui | 137 --- testsuite/reftests/inherit-and-initial.ref.ui | 16 +- testsuite/reftests/inherit-and-initial.ui | 16 +- 20 files changed, 147 insertions(+), 1577 deletions(-) delete mode 100644 gtk/deprecated/gtkalignment.c delete mode 100644 gtk/deprecated/gtkalignment.h delete mode 100644 testsuite/reftests/alignment-props.css delete mode 100644 testsuite/reftests/alignment-props.ref.ui delete mode 100644 testsuite/reftests/alignment-props.ui diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index aa726c7690..fdb5077b12 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -331,27 +331,6 @@ GtkAdjustmentPrivate gtk_adjustment_get_type -
-gtkalignment -GtkAlignment -GtkAlignment -GtkAlignmentClass -gtk_alignment_new -gtk_alignment_set -gtk_alignment_get_padding -gtk_alignment_set_padding - -GTK_ALIGNMENT -GTK_IS_ALIGNMENT -GTK_TYPE_ALIGNMENT -GTK_ALIGNMENT_CLASS -GTK_IS_ALIGNMENT_CLASS -GTK_ALIGNMENT_GET_CLASS - -gtk_alignment_get_type -GtkAlignmentPrivate -
-
gtkassistant GtkAssistant diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index f57472f861..5c2a7a21d0 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -69,20 +69,18 @@ static WidgetInfo * create_button (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_button_new_with_mnemonic ("_Button"); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("button", align, SMALL); + return new_widget_info ("button", widget, SMALL); } static WidgetInfo * create_switch (void) { GtkWidget *widget; - GtkWidget *align; GtkWidget *sw; widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); @@ -92,51 +90,48 @@ create_switch (void) sw = gtk_switch_new (); gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("switch", align, SMALL); + return new_widget_info ("switch", widget, SMALL); } static WidgetInfo * create_toggle_button (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_toggle_button_new_with_mnemonic ("_Toggle Button"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("toggle-button", align, SMALL); + return new_widget_info ("toggle-button", widget, SMALL); } static WidgetInfo * create_check_button (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_check_button_new_with_mnemonic ("_Check Button"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("check-button", align, SMALL); + return new_widget_info ("check-button", widget, SMALL); } static WidgetInfo * create_link_button (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_link_button_new_with_label ("http://www.gtk.org", "Link Button"); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("link-button", align, SMALL); + return new_widget_info ("link-button", widget, SMALL); } static WidgetInfo * @@ -222,29 +217,27 @@ static WidgetInfo * create_entry (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_entry_new (); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); gtk_entry_set_text (GTK_ENTRY (widget), "Entry"); gtk_editable_set_position (GTK_EDITABLE (widget), -1); - align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - return new_widget_info ("entry", align, SMALL); + return new_widget_info ("entry", widget, SMALL); } static WidgetInfo * create_search_entry (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_search_entry_new (); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); gtk_entry_set_placeholder_text (GTK_ENTRY (widget), "Search..."); - align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - return new_widget_info ("search-entry", align, SMALL); + return new_widget_info ("search-entry", widget, SMALL); } static WidgetInfo * @@ -252,7 +245,6 @@ create_radio (void) { GtkWidget *widget; GtkWidget *radio; - GtkWidget *align; widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One"); @@ -261,23 +253,22 @@ create_radio (void) gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE); radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree"); gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("radio-group", align, MEDIUM); + return new_widget_info ("radio-group", widget, MEDIUM); } static WidgetInfo * create_label (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_label_new ("Label"); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("label", align, SMALL); + return new_widget_info ("label", widget, SMALL); } static WidgetInfo * @@ -312,7 +303,6 @@ static WidgetInfo * create_combo_box_entry (void) { GtkWidget *widget; - GtkWidget *align; GtkWidget *child; GtkTreeModel *model; @@ -326,17 +316,16 @@ create_combo_box_entry (void) child = gtk_bin_get_child (GTK_BIN (widget)); gtk_entry_set_text (GTK_ENTRY (child), "Combo Box Entry"); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("combo-box-entry", align, SMALL); + return new_widget_info ("combo-box-entry", widget, SMALL); } static WidgetInfo * create_combo_box (void) { GtkWidget *widget; - GtkWidget *align; GtkCellRenderer *cell; GtkListStore *store; @@ -351,33 +340,31 @@ create_combo_box (void) gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("combo-box", align, SMALL); + return new_widget_info ("combo-box", widget, SMALL); } static WidgetInfo * create_combo_box_text (void) { GtkWidget *widget; - GtkWidget *align; widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Combo Box Text"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - return new_widget_info ("combo-box-text", align, SMALL); + return new_widget_info ("combo-box-text", widget, SMALL); } static WidgetInfo * create_info_bar (void) { GtkWidget *widget; - GtkWidget *align; WidgetInfo *info; widget = gtk_info_bar_new (); @@ -386,10 +373,10 @@ create_info_bar (void) gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (widget))), gtk_label_new ("Info Bar")); - align = gtk_alignment_new (0.5, 0, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - info = new_widget_info ("info-bar", align, SMALL); + info = new_widget_info ("info-bar", widget, SMALL); return info; } @@ -542,7 +529,6 @@ create_icon_view (void) { GtkWidget *widget; GtkWidget *vbox; - GtkWidget *align; GtkWidget *icon_view; GtkListStore *list_store; GtkTreeIter iter; @@ -568,9 +554,7 @@ create_icon_view (void) gtk_container_add (GTK_CONTAINER (widget), icon_view); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Icon View"), FALSE, FALSE); @@ -586,17 +570,16 @@ create_color_button (void) { GtkWidget *vbox; GtkWidget *picker; - GtkWidget *align; GdkRGBA color; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); color.red = 0x1e<<8; /* Go Gagne! */ color.green = 0x90<<8; color.blue = 0xff<<8; picker = gtk_color_button_new_with_rgba (&color); - gtk_container_add (GTK_CONTAINER (align), picker); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); + gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Color Button"), FALSE, FALSE); @@ -609,13 +592,12 @@ create_font_button (void) { GtkWidget *vbox; GtkWidget *picker; - GtkWidget *align; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); picker = gtk_font_button_new_with_font ("Sans Serif 10"); - gtk_container_add (GTK_CONTAINER (align), picker); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); + gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Font Button"), FALSE, FALSE); @@ -629,17 +611,16 @@ create_file_button (void) GtkWidget *vbox; GtkWidget *vbox2; GtkWidget *picker; - GtkWidget *align; char *path; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); picker = gtk_file_chooser_button_new ("File Chooser Button", GTK_FILE_CHOOSER_ACTION_OPEN); gtk_widget_set_size_request (picker, 150, -1); - gtk_container_add (GTK_CONTAINER (align), picker); - gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE); + gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); + gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox2), gtk_label_new ("File Button (Files)"), FALSE, FALSE); @@ -651,15 +632,15 @@ create_file_button (void) FALSE, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); picker = gtk_file_chooser_button_new ("File Chooser Button", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); gtk_widget_set_size_request (picker, 150, -1); path = g_build_filename (g_get_home_dir (), "Documents", NULL); gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (picker), path); g_free (path); - gtk_container_add (GTK_CONTAINER (align), picker); - gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE); + gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); + gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox2), gtk_label_new ("File Button (Select Folder)"), FALSE, FALSE); @@ -885,7 +866,7 @@ create_toolpalette (void) static WidgetInfo * create_menubar (void) { - GtkWidget *widget, *vbox, *align, *item; + GtkWidget *widget, *vbox, *item; widget = gtk_menu_bar_new (); @@ -899,9 +880,9 @@ create_menubar (void) gtk_menu_shell_append (GTK_MENU_SHELL (widget), item); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Bar"), FALSE, FALSE); @@ -973,15 +954,14 @@ create_progressbar (void) { GtkWidget *vbox; GtkWidget *widget; - GtkWidget *align; widget = gtk_progress_bar_new (); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), 0.5); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Progress Bar"), FALSE, FALSE); @@ -1026,15 +1006,15 @@ static WidgetInfo * create_scrollbar (void) { GtkWidget *widget; - GtkWidget *vbox, *align; + GtkWidget *vbox; widget = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL); gtk_widget_set_size_request (widget, 100, -1); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Scrollbar"), FALSE, FALSE); @@ -1046,14 +1026,14 @@ static WidgetInfo * create_spinbutton (void) { GtkWidget *widget; - GtkWidget *vbox, *align; + GtkWidget *vbox; widget = gtk_spin_button_new_with_range (0.0, 100.0, 1.0); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Spin Button"), FALSE, FALSE); @@ -1066,20 +1046,17 @@ create_statusbar (void) { WidgetInfo *info; GtkWidget *widget; - GtkWidget *vbox, *align; + GtkWidget *vbox; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), gtk_label_new ("Status Bar")); gtk_box_pack_start (GTK_BOX (vbox), - align, - FALSE, FALSE); + gtk_label_new ("Status Bar"), + FALSE, FALSE); widget = gtk_statusbar_new (); - align = gtk_alignment_new (0.5, 1.0, 1.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); + gtk_widget_set_halign (widget, GTK_ALIGN_FILL); gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on..."); - gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE); info = new_widget_info ("statusbar", vbox, SMALL); @@ -1116,15 +1093,15 @@ static WidgetInfo * create_image (void) { GtkWidget *widget; - GtkWidget *align, *vbox; + GtkWidget *vbox; widget = gtk_image_new_from_icon_name ("applications-graphics", GTK_ICON_SIZE_DIALOG); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Image"), FALSE, FALSE); @@ -1136,16 +1113,16 @@ static WidgetInfo * create_spinner (void) { GtkWidget *widget; - GtkWidget *align, *vbox; + GtkWidget *vbox; widget = gtk_spinner_new (); gtk_widget_set_size_request (widget, 24, 24); gtk_spinner_start (GTK_SPINNER (widget)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); - gtk_container_add (GTK_CONTAINER (align), widget); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); + gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Spinner"), FALSE, FALSE); @@ -1210,13 +1187,13 @@ static WidgetInfo * create_appchooserbutton (void) { GtkWidget *picker; - GtkWidget *align, *vbox; + GtkWidget *vbox; vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); picker = gtk_app_chooser_button_new ("text/plain"); - gtk_container_add (GTK_CONTAINER (align), picker); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); + gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); + gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Application Button"), FALSE, FALSE); @@ -1296,15 +1273,14 @@ create_placessidebar (void) { GtkWidget *bar; GtkWidget *vbox; - GtkWidget *align; bar = gtk_places_sidebar_new (); gtk_widget_set_size_request (bar, 150, 300); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_widget_set_halign (bar, GTK_ALIGN_CENTER); + gtk_widget_set_valign (bar, GTK_ALIGN_CENTER); - gtk_container_add (GTK_CONTAINER (align), bar); - gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Places Sidebar"), FALSE, FALSE); diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c index 90fb259511..b17db64d83 100644 --- a/gtk/a11y/gtkbuttonaccessible.c +++ b/gtk/a11y/gtkbuttonaccessible.c @@ -100,10 +100,6 @@ get_label_from_button (GtkWidget *button) GtkWidget *child; child = gtk_bin_get_child (GTK_BIN (button)); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - if (GTK_IS_ALIGNMENT (child)) - child = gtk_bin_get_child (GTK_BIN (child)); -G_GNUC_END_IGNORE_DEPRECATIONS if (GTK_IS_CONTAINER (child)) child = find_label_child (GTK_CONTAINER (child)); diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c index ffa42a278a..e3b9ee847b 100644 --- a/gtk/a11y/gtkwidgetaccessible.c +++ b/gtk/a11y/gtkwidgetaccessible.c @@ -281,18 +281,12 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj) GtkWidget *temp_widget; temp_widget = gtk_widget_get_parent (widget); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - if (GTK_IS_ALIGNMENT (temp_widget)) + if (GTK_IS_BOX (temp_widget)) { - temp_widget = gtk_widget_get_parent (temp_widget); - if (GTK_IS_BOX (temp_widget)) - { - label = find_label (temp_widget); - if (!label) - label = find_label (gtk_widget_get_parent (temp_widget)); - } + label = find_label (temp_widget); + if (!label) + label = find_label (gtk_widget_get_parent (temp_widget)); } -G_GNUC_END_IGNORE_DEPRECATIONS } else if (GTK_IS_COMBO_BOX (widget)) /* diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc index 371be26ced..fdc44f0c3c 100644 --- a/gtk/deprecated/Makefile.inc +++ b/gtk/deprecated/Makefile.inc @@ -2,7 +2,6 @@ deprecated_h_sources = \ deprecated/gtkactivatable.h \ deprecated/gtkaction.h \ deprecated/gtkactiongroup.h \ - deprecated/gtkalignment.h \ deprecated/gtkgradient.h \ deprecated/gtkradioaction.h \ deprecated/gtkrecentaction.h \ @@ -19,7 +18,6 @@ deprecated_c_sources = \ deprecated/gtkactivatable.c \ deprecated/gtkaction.c \ deprecated/gtkactiongroup.c \ - deprecated/gtkalignment.c \ deprecated/gtkgradient.c \ deprecated/gtkradioaction.c \ deprecated/gtkrecentaction.c \ diff --git a/gtk/deprecated/gtkalignment.c b/gtk/deprecated/gtkalignment.c deleted file mode 100644 index 8c5913e175..0000000000 --- a/gtk/deprecated/gtkalignment.c +++ /dev/null @@ -1,884 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -/** - * SECTION:gtkalignment - * @Short_description: A widget which controls the alignment and size of its child - * @Title: GtkAlignment - * - * The #GtkAlignment widget controls the alignment and size of its child widget. - * It has four settings: xscale, yscale, xalign, and yalign. - * - * The scale settings are used to specify how much the child widget should - * expand to fill the space allocated to the #GtkAlignment. - * The values can range from 0 (meaning the child doesn’t expand at all) to - * 1 (meaning the child expands to fill all of the available space). - * - * The align settings are used to place the child widget within the available - * area. The values range from 0 (top or left) to 1 (bottom or right). - * Of course, if the scale settings are both set to 1, the alignment settings - * have no effect. - * - * GtkAlignment has been deprecated in 3.14 and should not be used in - * newly-written code. The desired effect can be achieved by using the - * #GtkWidget:halign, #GtkWidget:valign and #GtkWidget:margin properties on the - * child widget. - */ - -#include "config.h" -#include "gtkalignment.h" -#include "gtksizerequest.h" -#include "gtkprivate.h" -#include "gtkintl.h" - - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - - -struct _GtkAlignmentPrivate -{ - gfloat xalign; - gfloat yalign; - gfloat xscale; - gfloat yscale; - - guint padding_bottom; - guint padding_top; - guint padding_left; - guint padding_right; -}; - -enum { - PROP_0, - - PROP_XALIGN, - PROP_YALIGN, - PROP_XSCALE, - PROP_YSCALE, - - PROP_TOP_PADDING, - PROP_BOTTOM_PADDING, - PROP_LEFT_PADDING, - PROP_RIGHT_PADDING -}; - -static void gtk_alignment_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -static void gtk_alignment_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void gtk_alignment_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void gtk_alignment_get_preferred_width (GtkWidget *widget, - gint *minimum_size, - gint *natural_size); -static void gtk_alignment_get_preferred_height (GtkWidget *widget, - gint *minimum_size, - gint *natural_size); -static void gtk_alignment_get_preferred_width_for_height (GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size); -static void gtk_alignment_get_preferred_height_for_width (GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size); -static void gtk_alignment_get_preferred_height_and_baseline_for_width (GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size, - gint *minimum_baseline, - gint *natural_baseline); - -G_DEFINE_TYPE_WITH_PRIVATE (GtkAlignment, gtk_alignment, GTK_TYPE_BIN) - -static void -gtk_alignment_class_init (GtkAlignmentClass *class) -{ - GObjectClass *gobject_class; - GtkWidgetClass *widget_class; - - gobject_class = (GObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - - gobject_class->set_property = gtk_alignment_set_property; - gobject_class->get_property = gtk_alignment_get_property; - - widget_class->size_allocate = gtk_alignment_size_allocate; - widget_class->get_preferred_width = gtk_alignment_get_preferred_width; - widget_class->get_preferred_height = gtk_alignment_get_preferred_height; - widget_class->get_preferred_width_for_height = gtk_alignment_get_preferred_width_for_height; - widget_class->get_preferred_height_for_width = gtk_alignment_get_preferred_height_for_width; - widget_class->get_preferred_height_and_baseline_for_width = gtk_alignment_get_preferred_height_and_baseline_for_width; - - /** - * GtkAlignment:xalign: - * - * Horizontal position of child in available space. A value of 0.0 - * will flush the child left (or right, in RTL locales); a value - * of 1.0 will flush the child right (or left, in RTL locales). - * - * Deprecated: 3.14: Use gtk_widget_set_halign() on the child instead - */ - g_object_class_install_property (gobject_class, - PROP_XALIGN, - g_param_spec_float("xalign", - P_("Horizontal alignment"), - P_("Horizontal position of child in available space. 0.0 is left aligned, 1.0 is right aligned"), - 0.0, - 1.0, - 0.5, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - - /** - * GtkAlignment:yalign: - * - * Vertical position of child in available space. A value of 0.0 - * will flush the child to the top; a value of 1.0 will flush the - * child to the bottom. - * - * Deprecated: 3.14: Use gtk_widget_set_valign() on the child instead - */ - g_object_class_install_property (gobject_class, - PROP_YALIGN, - g_param_spec_float("yalign", - P_("Vertical alignment"), - P_("Vertical position of child in available space. 0.0 is top aligned, 1.0 is bottom aligned"), - 0.0, - 1.0, - 0.5, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - /** - * GtkAlignment:xscale: - * - * If available horizontal space is bigger than needed, how much - * of it to use for the child. A value of 0.0 means none; a value - * of 1.0 means all. - * - * Deprecated: 3.14: Use gtk_widget_set_hexpand() on the child instead - */ - g_object_class_install_property (gobject_class, - PROP_XSCALE, - g_param_spec_float("xscale", - P_("Horizontal scale"), - P_("If available horizontal space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"), - 0.0, - 1.0, - 1.0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - /** - * GtkAlignment:yscale: - * - * If available vertical space is bigger than needed, how much - * of it to use for the child. A value of 0.0 means none; a value - * of 1.0 means all. - * - * Deprecated: 3.14: Use gtk_widget_set_vexpand() on the child instead - */ - g_object_class_install_property (gobject_class, - PROP_YSCALE, - g_param_spec_float("yscale", - P_("Vertical scale"), - P_("If available vertical space is bigger than needed for the child, how much of it to use for the child. 0.0 means none, 1.0 means all"), - 0.0, - 1.0, - 1.0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - - -/** - * GtkAlignment:top-padding: - * - * The padding to insert at the top of the widget. - * - * Since: 2.4 - * - * Deprecated: 3.14: Use gtk_widget_set_margin_top() instead - */ - g_object_class_install_property (gobject_class, - PROP_TOP_PADDING, - g_param_spec_uint("top-padding", - P_("Top Padding"), - P_("The padding to insert at the top of the widget."), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - -/** - * GtkAlignment:bottom-padding: - * - * The padding to insert at the bottom of the widget. - * - * Since: 2.4 - * - * Deprecated: 3.14: Use gtk_widget_set_margin_bottom() instead - */ - g_object_class_install_property (gobject_class, - PROP_BOTTOM_PADDING, - g_param_spec_uint("bottom-padding", - P_("Bottom Padding"), - P_("The padding to insert at the bottom of the widget."), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - -/** - * GtkAlignment:left-padding: - * - * The padding to insert at the left of the widget. - * - * Since: 2.4 - * - * Deprecated: 3.14: Use gtk_widget_set_margin_start() instead - */ - g_object_class_install_property (gobject_class, - PROP_LEFT_PADDING, - g_param_spec_uint("left-padding", - P_("Left Padding"), - P_("The padding to insert at the left of the widget."), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); - -/** - * GtkAlignment:right-padding: - * - * The padding to insert at the right of the widget. - * - * Since: 2.4 - * - * Deprecated: 3.14: Use gtk_widget_set_margin_end() instead - */ - g_object_class_install_property (gobject_class, - PROP_RIGHT_PADDING, - g_param_spec_uint("right-padding", - P_("Right Padding"), - P_("The padding to insert at the right of the widget."), - 0, - G_MAXINT, - 0, - GTK_PARAM_READWRITE|G_PARAM_DEPRECATED)); -} - -static void -gtk_alignment_init (GtkAlignment *alignment) -{ - GtkAlignmentPrivate *priv; - - alignment->priv = gtk_alignment_get_instance_private (alignment); - priv = alignment->priv; - - gtk_widget_set_has_window (GTK_WIDGET (alignment), FALSE); - gtk_widget_set_redraw_on_allocate (GTK_WIDGET (alignment), FALSE); - - priv->xalign = 0.5; - priv->yalign = 0.5; - priv->xscale = 1.0; - priv->yscale = 1.0; - - /* Initialize padding with default values: */ - priv->padding_top = 0; - priv->padding_bottom = 0; - priv->padding_left = 0; - priv->padding_right = 0; -} - -/** - * gtk_alignment_new: - * @xalign: the horizontal alignment of the child widget, from 0 (left) to 1 - * (right). - * @yalign: the vertical alignment of the child widget, from 0 (top) to 1 - * (bottom). - * @xscale: the amount that the child widget expands horizontally to fill up - * unused space, from 0 to 1. - * A value of 0 indicates that the child widget should never expand. - * A value of 1 indicates that the child widget will expand to fill all of the - * space allocated for the #GtkAlignment. - * @yscale: the amount that the child widget expands vertically to fill up - * unused space, from 0 to 1. The values are similar to @xscale. - * - * Creates a new #GtkAlignment. - * - * Returns: the new #GtkAlignment - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties - */ -GtkWidget* -gtk_alignment_new (gfloat xalign, - gfloat yalign, - gfloat xscale, - gfloat yscale) -{ - GtkAlignment *alignment; - GtkAlignmentPrivate *priv; - - alignment = g_object_new (GTK_TYPE_ALIGNMENT, NULL); - - priv = alignment->priv; - - priv->xalign = CLAMP (xalign, 0.0, 1.0); - priv->yalign = CLAMP (yalign, 0.0, 1.0); - priv->xscale = CLAMP (xscale, 0.0, 1.0); - priv->yscale = CLAMP (yscale, 0.0, 1.0); - - return GTK_WIDGET (alignment); -} - -static void -gtk_alignment_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GtkAlignment *alignment = GTK_ALIGNMENT (object); - GtkAlignmentPrivate *priv = alignment->priv; - - switch (prop_id) - { - case PROP_XALIGN: - gtk_alignment_set (alignment, - g_value_get_float (value), - priv->yalign, - priv->xscale, - priv->yscale); - break; - case PROP_YALIGN: - gtk_alignment_set (alignment, - priv->xalign, - g_value_get_float (value), - priv->xscale, - priv->yscale); - break; - case PROP_XSCALE: - gtk_alignment_set (alignment, - priv->xalign, - priv->yalign, - g_value_get_float (value), - priv->yscale); - break; - case PROP_YSCALE: - gtk_alignment_set (alignment, - priv->xalign, - priv->yalign, - priv->xscale, - g_value_get_float (value)); - break; - - /* Padding: */ - case PROP_TOP_PADDING: - gtk_alignment_set_padding (alignment, - g_value_get_uint (value), - priv->padding_bottom, - priv->padding_left, - priv->padding_right); - break; - case PROP_BOTTOM_PADDING: - gtk_alignment_set_padding (alignment, - priv->padding_top, - g_value_get_uint (value), - priv->padding_left, - priv->padding_right); - break; - case PROP_LEFT_PADDING: - gtk_alignment_set_padding (alignment, - priv->padding_top, - priv->padding_bottom, - g_value_get_uint (value), - priv->padding_right); - break; - case PROP_RIGHT_PADDING: - gtk_alignment_set_padding (alignment, - priv->padding_top, - priv->padding_bottom, - priv->padding_left, - g_value_get_uint (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gtk_alignment_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GtkAlignment *alignment = GTK_ALIGNMENT (object); - GtkAlignmentPrivate *priv = alignment->priv; - - switch (prop_id) - { - case PROP_XALIGN: - g_value_set_float(value, priv->xalign); - break; - case PROP_YALIGN: - g_value_set_float(value, priv->yalign); - break; - case PROP_XSCALE: - g_value_set_float(value, priv->xscale); - break; - case PROP_YSCALE: - g_value_set_float(value, priv->yscale); - break; - - /* Padding: */ - case PROP_TOP_PADDING: - g_value_set_uint (value, priv->padding_top); - break; - case PROP_BOTTOM_PADDING: - g_value_set_uint (value, priv->padding_bottom); - break; - case PROP_LEFT_PADDING: - g_value_set_uint (value, priv->padding_left); - break; - case PROP_RIGHT_PADDING: - g_value_set_uint (value, priv->padding_right); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -/** - * gtk_alignment_set: - * @alignment: a #GtkAlignment. - * @xalign: the horizontal alignment of the child widget, from 0 (left) to 1 - * (right). - * @yalign: the vertical alignment of the child widget, from 0 (top) to 1 - * (bottom). - * @xscale: the amount that the child widget expands horizontally to fill up - * unused space, from 0 to 1. - * A value of 0 indicates that the child widget should never expand. - * A value of 1 indicates that the child widget will expand to fill all of the - * space allocated for the #GtkAlignment. - * @yscale: the amount that the child widget expands vertically to fill up - * unused space, from 0 to 1. The values are similar to @xscale. - * - * Sets the #GtkAlignment values. - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties - */ -void -gtk_alignment_set (GtkAlignment *alignment, - gfloat xalign, - gfloat yalign, - gfloat xscale, - gfloat yscale) -{ - GtkAlignmentPrivate *priv; - GtkWidget *child; - - g_return_if_fail (GTK_IS_ALIGNMENT (alignment)); - - priv = alignment->priv; - - xalign = CLAMP (xalign, 0.0, 1.0); - yalign = CLAMP (yalign, 0.0, 1.0); - xscale = CLAMP (xscale, 0.0, 1.0); - yscale = CLAMP (yscale, 0.0, 1.0); - - if ( (priv->xalign != xalign) - || (priv->yalign != yalign) - || (priv->xscale != xscale) - || (priv->yscale != yscale)) - { - g_object_freeze_notify (G_OBJECT (alignment)); - if (priv->xalign != xalign) - { - priv->xalign = xalign; - g_object_notify (G_OBJECT (alignment), "xalign"); - } - if (priv->yalign != yalign) - { - priv->yalign = yalign; - g_object_notify (G_OBJECT (alignment), "yalign"); - } - if (priv->xscale != xscale) - { - priv->xscale = xscale; - g_object_notify (G_OBJECT (alignment), "xscale"); - } - if (priv->yscale != yscale) - { - priv->yscale = yscale; - g_object_notify (G_OBJECT (alignment), "yscale"); - } - g_object_thaw_notify (G_OBJECT (alignment)); - - child = gtk_bin_get_child (GTK_BIN (alignment)); - if (child) - gtk_widget_queue_resize (child); - gtk_widget_queue_draw (GTK_WIDGET (alignment)); - } -} - - -static void -gtk_alignment_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkAlignment *alignment = GTK_ALIGNMENT (widget); - GtkAlignmentPrivate *priv = alignment->priv; - GtkBin *bin; - GtkAllocation child_allocation; - GtkWidget *child; - gint width, height; - gint baseline; - - gtk_widget_set_allocation (widget, allocation); - bin = GTK_BIN (widget); - - child = gtk_bin_get_child (bin); - if (child && gtk_widget_get_visible (child)) - { - gint padding_horizontal, padding_vertical; - gint child_nat_width; - gint child_nat_height; - gint child_width, child_height; - double yalign, yscale; - - padding_horizontal = priv->padding_left + priv->padding_right; - padding_vertical = priv->padding_top + priv->padding_bottom; - - width = MAX (1, allocation->width - padding_horizontal); - height = MAX (1, allocation->height - padding_vertical); - - baseline = gtk_widget_get_allocated_baseline (widget); - if (baseline != -1) - baseline -= priv->padding_top; - - /* If we get a baseline set that means we're baseline aligned, and the parent - honored that. In that case we have to ignore yalign/yscale as we need - yalign based on the baseline and always FILL mode to ensure we can place - the baseline anywhere */ - if (baseline != -1) - { - yalign = 0; - yscale = 1.0; - } - else - { - yalign = priv->yalign; - yscale = priv->yscale; - } - - if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH) - { - gtk_widget_get_preferred_width (child, NULL, &child_nat_width); - - child_width = MIN (width, child_nat_width); - - gtk_widget_get_preferred_height_for_width (child, child_width, NULL, &child_nat_height); - - child_height = MIN (height, child_nat_height); - } - else - { - gtk_widget_get_preferred_height (child, NULL, &child_nat_height); - - child_height = MIN (height, child_nat_height); - - gtk_widget_get_preferred_width_for_height (child, child_height, NULL, &child_nat_width); - - child_width = MIN (width, child_nat_width); - } - - if (width > child_width) - child_allocation.width = (child_width * - (1.0 - priv->xscale) + - width * priv->xscale); - else - child_allocation.width = width; - - if (height > child_height) - child_allocation.height = (child_height * - (1.0 - yscale) + - height * yscale); - else - child_allocation.height = height; - - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) - child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + priv->padding_right; - else - child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + priv->padding_left; - - child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + priv->padding_top; - - gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline); - } -} - - -static void -gtk_alignment_get_preferred_size (GtkWidget *widget, - GtkOrientation orientation, - gint for_size, - gint *minimum_size, - gint *natural_size, - gint *minimum_baseline, - gint *natural_baseline) -{ - GtkAlignment *alignment = GTK_ALIGNMENT (widget); - GtkAlignmentPrivate *priv = alignment->priv; - GtkWidget *child; - guint minimum, natural; - guint top_offset; - - if (minimum_baseline) - *minimum_baseline = -1; - if (natural_baseline) - *natural_baseline = -1; - - natural = minimum = 0; - top_offset = 0; - - if ((child = gtk_bin_get_child (GTK_BIN (widget))) && gtk_widget_get_visible (child)) - { - gint child_min, child_nat; - gint child_min_baseline = -1, child_nat_baseline = -1; - - /* Request extra space for the padding: */ - if (orientation == GTK_ORIENTATION_HORIZONTAL) - { - minimum += (priv->padding_left + priv->padding_right); - - if (for_size < 0) - gtk_widget_get_preferred_width (child, &child_min, &child_nat); - else - { - gint min_height; - - gtk_widget_get_preferred_height (child, &min_height, NULL); - - for_size -= (priv->padding_top + priv->padding_bottom); - - if (for_size > min_height) - for_size = (min_height * (1.0 - priv->yscale) + - for_size * priv->yscale); - - gtk_widget_get_preferred_width_for_height (child, for_size, &child_min, &child_nat); - } - } - else - { - minimum += (priv->padding_top + priv->padding_bottom); - top_offset += priv->padding_top; - - if (for_size < 0) - gtk_widget_get_preferred_height_and_baseline_for_width (child, -1, &child_min, &child_nat, &child_min_baseline, &child_nat_baseline); - else - { - gint min_width; - - gtk_widget_get_preferred_width (child, &min_width, NULL); - - for_size -= (priv->padding_left + priv->padding_right); - - if (for_size > min_width) - for_size = (min_width * (1.0 - priv->xscale) + - for_size * priv->xscale); - - gtk_widget_get_preferred_height_and_baseline_for_width (child, for_size, &child_min, &child_nat, &child_min_baseline, &child_nat_baseline); - } - - if (minimum_baseline && child_min_baseline >= 0) - *minimum_baseline = child_min_baseline + top_offset; - if (natural_baseline && child_nat_baseline >= 0) - *natural_baseline = child_nat_baseline + top_offset; - } - - natural = minimum; - - minimum += child_min; - natural += child_nat; - } - - *minimum_size = minimum; - *natural_size = natural; -} - -static void -gtk_alignment_get_preferred_width (GtkWidget *widget, - gint *minimum_size, - gint *natural_size) -{ - gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum_size, natural_size, NULL, NULL); -} - -static void -gtk_alignment_get_preferred_height (GtkWidget *widget, - gint *minimum_size, - gint *natural_size) -{ - gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, -1, minimum_size, natural_size, NULL, NULL); -} - - -static void -gtk_alignment_get_preferred_width_for_height (GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size) -{ - gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, for_size, minimum_size, natural_size, NULL, NULL); -} - -static void -gtk_alignment_get_preferred_height_for_width (GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size) -{ - gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum_size, natural_size, NULL, NULL); -} - -static void -gtk_alignment_get_preferred_height_and_baseline_for_width (GtkWidget *widget, - gint for_size, - gint *minimum_size, - gint *natural_size, - gint *minimum_baseline, - gint *natural_baseline) -{ - gtk_alignment_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum_size, natural_size, minimum_baseline, natural_baseline); -} - - -/** - * gtk_alignment_set_padding: - * @alignment: a #GtkAlignment - * @padding_top: the padding at the top of the widget - * @padding_bottom: the padding at the bottom of the widget - * @padding_left: the padding at the left of the widget - * @padding_right: the padding at the right of the widget. - * - * Sets the padding on the different sides of the widget. - * The padding adds blank space to the sides of the widget. For instance, - * this can be used to indent the child widget towards the right by adding - * padding on the left. - * - * Since: 2.4 - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties - */ -void -gtk_alignment_set_padding (GtkAlignment *alignment, - guint padding_top, - guint padding_bottom, - guint padding_left, - guint padding_right) -{ - GtkAlignmentPrivate *priv; - GtkWidget *child; - - g_return_if_fail (GTK_IS_ALIGNMENT (alignment)); - - priv = alignment->priv; - - g_object_freeze_notify (G_OBJECT (alignment)); - - if (priv->padding_top != padding_top) - { - priv->padding_top = padding_top; - g_object_notify (G_OBJECT (alignment), "top-padding"); - } - if (priv->padding_bottom != padding_bottom) - { - priv->padding_bottom = padding_bottom; - g_object_notify (G_OBJECT (alignment), "bottom-padding"); - } - if (priv->padding_left != padding_left) - { - priv->padding_left = padding_left; - g_object_notify (G_OBJECT (alignment), "left-padding"); - } - if (priv->padding_right != padding_right) - { - priv->padding_right = padding_right; - g_object_notify (G_OBJECT (alignment), "right-padding"); - } - - g_object_thaw_notify (G_OBJECT (alignment)); - - /* Make sure that the widget and children are redrawn with the new setting: */ - child = gtk_bin_get_child (GTK_BIN (alignment)); - if (child) - gtk_widget_queue_resize (child); - - gtk_widget_queue_draw (GTK_WIDGET (alignment)); -} - -/** - * gtk_alignment_get_padding: - * @alignment: a #GtkAlignment - * @padding_top: (out) (allow-none): location to store the padding for - * the top of the widget, or %NULL - * @padding_bottom: (out) (allow-none): location to store the padding - * for the bottom of the widget, or %NULL - * @padding_left: (out) (allow-none): location to store the padding - * for the left of the widget, or %NULL - * @padding_right: (out) (allow-none): location to store the padding - * for the right of the widget, or %NULL - * - * Gets the padding on the different sides of the widget. - * See gtk_alignment_set_padding (). - * - * Since: 2.4 - * - * Deprecated: 3.14: Use #GtkWidget alignment and margin properties - */ -void -gtk_alignment_get_padding (GtkAlignment *alignment, - guint *padding_top, - guint *padding_bottom, - guint *padding_left, - guint *padding_right) -{ - GtkAlignmentPrivate *priv; - - g_return_if_fail (GTK_IS_ALIGNMENT (alignment)); - - priv = alignment->priv; - - if(padding_top) - *padding_top = priv->padding_top; - if(padding_bottom) - *padding_bottom = priv->padding_bottom; - if(padding_left) - *padding_left = priv->padding_left; - if(padding_right) - *padding_right = priv->padding_right; -} diff --git a/gtk/deprecated/gtkalignment.h b/gtk/deprecated/gtkalignment.h deleted file mode 100644 index fb7ebb4d7f..0000000000 --- a/gtk/deprecated/gtkalignment.h +++ /dev/null @@ -1,107 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -/* - * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -#ifndef __GTK_ALIGNMENT_H__ -#define __GTK_ALIGNMENT_H__ - - -#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) -#error "Only can be included directly." -#endif - -#include - - -G_BEGIN_DECLS - -#define GTK_TYPE_ALIGNMENT (gtk_alignment_get_type ()) -#define GTK_ALIGNMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ALIGNMENT, GtkAlignment)) -#define GTK_ALIGNMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ALIGNMENT, GtkAlignmentClass)) -#define GTK_IS_ALIGNMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ALIGNMENT)) -#define GTK_IS_ALIGNMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ALIGNMENT)) -#define GTK_ALIGNMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ALIGNMENT, GtkAlignmentClass)) - - -typedef struct _GtkAlignment GtkAlignment; -typedef struct _GtkAlignmentPrivate GtkAlignmentPrivate; -typedef struct _GtkAlignmentClass GtkAlignmentClass; - -struct _GtkAlignment -{ - GtkBin bin; - - /*< private >*/ - GtkAlignmentPrivate *priv; -}; - -/** - * GtkAlignmentClass: - * @parent_class: The parent class. - */ -struct _GtkAlignmentClass -{ - GtkBinClass parent_class; - - /*< private >*/ - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - - -GDK_DEPRECATED_IN_3_14 -GType gtk_alignment_get_type (void) G_GNUC_CONST; -GDK_DEPRECATED_IN_3_14 -GtkWidget* gtk_alignment_new (gfloat xalign, - gfloat yalign, - gfloat xscale, - gfloat yscale); -GDK_DEPRECATED_IN_3_14 -void gtk_alignment_set (GtkAlignment *alignment, - gfloat xalign, - gfloat yalign, - gfloat xscale, - gfloat yscale); - -GDK_DEPRECATED_IN_3_14 -void gtk_alignment_set_padding (GtkAlignment *alignment, - guint padding_top, - guint padding_bottom, - guint padding_left, - guint padding_right); - -GDK_DEPRECATED_IN_3_14 -void gtk_alignment_get_padding (GtkAlignment *alignment, - guint *padding_top, - guint *padding_bottom, - guint *padding_left, - guint *padding_right); - -G_END_DECLS - - -#endif /* __GTK_ALIGNMENT_H__ */ diff --git a/gtk/gtk.h b/gtk/gtk.h index 610a920a61..5d58d629ba 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -247,7 +247,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index 2f6efdf3bd..5a104d683f 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -125,7 +125,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkToolItemGroup, gtk_tool_item_group, GTK_TYPE_CONTAIN gtk_tool_item_group_tool_shell_init)); static GtkWidget* -gtk_tool_item_group_get_alignment (GtkToolItemGroup *group) +gtk_tool_item_group_get_frame (GtkToolItemGroup *group) { return gtk_bin_get_child (GTK_BIN (group->priv->header)); } @@ -335,8 +335,8 @@ gtk_tool_item_group_header_clicked_cb (GtkButton *button, static void gtk_tool_item_group_header_adjust_style (GtkToolItemGroup *group) { - GtkWidget *alignment = gtk_tool_item_group_get_alignment (group); - GtkWidget *label_widget = gtk_bin_get_child (GTK_BIN (alignment)); + GtkWidget *frame = gtk_bin_get_child (GTK_BIN (group->priv->header)); + GtkWidget *label_widget = gtk_bin_get_child (GTK_BIN (frame)); GtkWidget *widget = GTK_WIDGET (group); GtkToolItemGroupPrivate* priv = group->priv; gint dx = 0, dy = 0; @@ -346,8 +346,6 @@ gtk_tool_item_group_header_adjust_style (GtkToolItemGroup *group) "header-spacing", &(priv->header_spacing), "expander-size", &(priv->expander_size), NULL); - - gtk_widget_set_size_request (alignment, -1, priv->expander_size); switch (gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group))) { @@ -375,9 +373,8 @@ gtk_tool_item_group_header_adjust_style (GtkToolItemGroup *group) break; } -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), dy, 0, dx, 0); -G_GNUC_END_IGNORE_DEPRECATIONS + gtk_widget_set_margin_start (frame, dx); + gtk_widget_set_margin_top (frame, dy); } static void @@ -398,7 +395,7 @@ update_arrow_state (GtkToolItemGroup *group) static void gtk_tool_item_group_init (GtkToolItemGroup *group) { - GtkWidget *alignment; + GtkWidget *frame; GtkToolItemGroupPrivate* priv; GtkCssNode *widget_node; @@ -414,21 +411,20 @@ gtk_tool_item_group_init (GtkToolItemGroup *group) priv->label_widget = gtk_label_new (NULL); gtk_widget_set_halign (priv->label_widget, GTK_ALIGN_START); gtk_widget_set_valign (priv->label_widget, GTK_ALIGN_CENTER); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); -G_GNUC_END_IGNORE_DEPRECATIONS - gtk_container_add (GTK_CONTAINER (alignment), priv->label_widget); - gtk_widget_show_all (alignment); + frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + gtk_container_add (GTK_CONTAINER (frame), priv->label_widget); + gtk_widget_show_all (frame); priv->header = gtk_button_new (); g_object_ref_sink (priv->header); gtk_widget_set_focus_on_click (priv->header, FALSE); - gtk_container_add (GTK_CONTAINER (priv->header), alignment); + gtk_container_add (GTK_CONTAINER (priv->header), frame); gtk_widget_set_parent (priv->header, GTK_WIDGET (group)); gtk_tool_item_group_header_adjust_style (group); - g_signal_connect_after (alignment, "draw", + g_signal_connect_after (frame, "draw", G_CALLBACK (gtk_tool_item_group_header_draw_cb), group); @@ -1763,7 +1759,7 @@ gtk_tool_item_group_set_label_widget (GtkToolItemGroup *group, GtkWidget *label_widget) { GtkToolItemGroupPrivate* priv; - GtkWidget *alignment; + GtkWidget *frame; g_return_if_fail (GTK_IS_TOOL_ITEM_GROUP (group)); g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget)); @@ -1774,17 +1770,17 @@ gtk_tool_item_group_set_label_widget (GtkToolItemGroup *group, if (priv->label_widget == label_widget) return; - alignment = gtk_tool_item_group_get_alignment (group); + frame = gtk_tool_item_group_get_frame (group); if (priv->label_widget) { gtk_widget_set_state_flags (priv->label_widget, 0, TRUE); - gtk_container_remove (GTK_CONTAINER (alignment), priv->label_widget); + gtk_container_remove (GTK_CONTAINER (frame), priv->label_widget); } if (label_widget) - gtk_container_add (GTK_CONTAINER (alignment), label_widget); + gtk_container_add (GTK_CONTAINER (frame), label_widget); priv->label_widget = label_widget; @@ -1841,14 +1837,14 @@ gtk_tool_item_group_force_expose (GtkToolItemGroup *group) if (gtk_widget_get_realized (priv->header)) { - GtkAllocation alignment_allocation; - GtkWidget *alignment = gtk_tool_item_group_get_alignment (group); + GtkAllocation frame_allocation; + GtkWidget *frame = gtk_tool_item_group_get_frame (group); GdkRectangle area; /* Find the header button's arrow area... */ - gtk_widget_get_allocation (alignment, &alignment_allocation); - area.x = alignment_allocation.x; - area.y = alignment_allocation.y + (alignment_allocation.height - priv->expander_size) / 2; + gtk_widget_get_allocation (frame, &frame_allocation); + area.x = frame_allocation.x; + area.y = frame_allocation.y + (frame_allocation.height - priv->expander_size) / 2; area.height = priv->expander_size; area.width = priv->expander_size; @@ -2022,9 +2018,9 @@ gtk_tool_item_group_get_label (GtkToolItemGroup *group) GtkWidget* gtk_tool_item_group_get_label_widget (GtkToolItemGroup *group) { - GtkWidget *alignment = gtk_tool_item_group_get_alignment (group); + GtkWidget *frame = gtk_tool_item_group_get_frame (group); - return gtk_bin_get_child (GTK_BIN (alignment)); + return gtk_bin_get_child (GTK_BIN (frame)); } /** diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 829882ac25..10b7962c4e 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -25,7 +25,6 @@ #include "gtktreeprivate.h" #include "gtkcelllayout.h" #include "gtkbutton.h" -#include "deprecated/gtkalignment.h" #include "gtklabel.h" #include "gtkbox.h" #include "gtkmarshalers.h" @@ -130,7 +129,7 @@ struct _GtkTreeViewColumnPrivate GtkWidget *button; GtkWidget *child; GtkWidget *arrow; - GtkWidget *alignment; + GtkWidget *frame; GdkWindow *window; gulong property_changed_signal; gfloat xalign; @@ -831,9 +830,9 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) G_CALLBACK (gtk_tree_view_column_button_clicked), tree_column); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - priv->alignment = gtk_alignment_new (priv->xalign, 0.5, 0.0, 0.0); -G_GNUC_END_IGNORE_DEPRECATIONS + priv->frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), GTK_SHADOW_NONE); + gtk_widget_set_halign (priv->frame, GTK_ALIGN_START); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); priv->arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON); @@ -852,20 +851,20 @@ G_GNUC_END_IGNORE_DEPRECATIONS if (priv->xalign <= 0.5) { - gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE); gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE); } else { gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE); } - gtk_container_add (GTK_CONTAINER (priv->alignment), child); + gtk_container_add (GTK_CONTAINER (priv->frame), child); gtk_container_add (GTK_CONTAINER (priv->button), hbox); gtk_widget_show (hbox); - gtk_widget_show (priv->alignment); + gtk_widget_show (priv->frame); } static void @@ -874,7 +873,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) GtkTreeViewColumnPrivate *priv = tree_column->priv; gint sort_column_id = -1; GtkWidget *hbox; - GtkWidget *alignment; + GtkWidget *frame; GtkWidget *arrow; GtkWidget *current_child; const gchar *icon_name = "missing-image"; @@ -886,22 +885,18 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) model = NULL; hbox = gtk_bin_get_child (GTK_BIN (priv->button)); - alignment = priv->alignment; + frame = priv->frame; arrow = priv->arrow; - current_child = gtk_bin_get_child (GTK_BIN (alignment)); + current_child = gtk_bin_get_child (GTK_BIN (frame)); /* Set up the actual button */ -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gtk_alignment_set (GTK_ALIGNMENT (alignment), priv->xalign, 0.5, 0.0, 0.0); -G_GNUC_END_IGNORE_DEPRECATIONS - if (priv->child) { if (current_child != priv->child) { - gtk_container_remove (GTK_CONTAINER (alignment), + gtk_container_remove (GTK_CONTAINER (frame), current_child); - gtk_container_add (GTK_CONTAINER (alignment), + gtk_container_add (GTK_CONTAINER (frame), priv->child); } } @@ -911,7 +906,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS { current_child = gtk_label_new (NULL); gtk_widget_show (current_child); - gtk_container_add (GTK_CONTAINER (alignment), + gtk_container_add (GTK_CONTAINER (frame), current_child); } diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c index f3aa635f72..f7f977267b 100644 --- a/tests/testadjustsize.c +++ b/tests/testadjustsize.c @@ -26,7 +26,6 @@ enum { TEST_WIDGET_LABEL, TEST_WIDGET_VERTICAL_LABEL, TEST_WIDGET_WRAP_LABEL, - TEST_WIDGET_ALIGNMENT, TEST_WIDGET_IMAGE, TEST_WIDGET_BUTTON, TEST_WIDGET_LAST @@ -64,36 +63,6 @@ create_button (void) return gtk_button_new_with_label ("BUTTON!"); } -static gboolean -on_draw_alignment (GtkWidget *widget, - cairo_t *cr, - void *data) -{ - cairo_set_source_rgb (cr, 1.0, 0.0, 0.0); - cairo_paint (cr); - - return FALSE; -} - -static GtkWidget* -create_alignment (void) -{ - GtkWidget *alignment; - -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); -G_GNUC_END_IGNORE_DEPRECATIONS - - /* make the alignment visible */ - gtk_widget_set_redraw_on_allocate (alignment, TRUE); - g_signal_connect (G_OBJECT (alignment), - "draw", - G_CALLBACK (on_draw_alignment), - NULL); - - return alignment; -} - static void open_test_window (void) { @@ -113,7 +82,6 @@ open_test_window (void) test_widgets[TEST_WIDGET_VERTICAL_LABEL] = create_label (TRUE, FALSE); test_widgets[TEST_WIDGET_WRAP_LABEL] = create_label (FALSE, TRUE); test_widgets[TEST_WIDGET_BUTTON] = create_button (); - test_widgets[TEST_WIDGET_ALIGNMENT] = create_alignment (); grid = gtk_grid_new (); diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c index 66e9531701..444a201370 100644 --- a/tests/testheightforwidth.c +++ b/tests/testheightforwidth.c @@ -634,15 +634,10 @@ TestInterface interfaces[] = { " True" " 0" " " - " " + " " " True" - " 12" - " " - " " - " True" - " some content" - " " - " " + " 12" + " some content" " " " " " " diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index 888f9d509c..0557092241 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -716,7 +716,6 @@ test_types (void) "" " " " " - " " " " " " " " diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c index 048ef220ff..853385f269 100644 --- a/testsuite/gtk/notify.c +++ b/testsuite/gtk/notify.c @@ -556,11 +556,6 @@ test_type (gconstpointer data) g_str_equal (pspec->name, "stock-detail"))) continue; - if (g_str_equal (g_type_name (pspec->owner_type), "GtkArrow") || - g_str_equal (g_type_name (pspec->owner_type), "GtkAlignment") || - g_str_equal (g_type_name (pspec->owner_type), "GtkMisc")) - continue; - if (g_type_is_a (pspec->owner_type, GTK_TYPE_MENU) && g_str_equal (pspec->name, "tearoff-state")) continue; diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am index 106a723350..06893bc40a 100644 --- a/testsuite/reftests/Makefile.am +++ b/testsuite/reftests/Makefile.am @@ -77,9 +77,6 @@ testdata = \ actionbar.css \ actionbar.ref.ui \ actionbar.ui \ - alignment-props.css \ - alignment-props.ref.ui \ - alignment-props.ui \ animation-direction.css \ animation-direction.ref.ui \ animation-direction.ui \ diff --git a/testsuite/reftests/alignment-props.css b/testsuite/reftests/alignment-props.css deleted file mode 100644 index 4abe303639..0000000000 --- a/testsuite/reftests/alignment-props.css +++ /dev/null @@ -1,8 +0,0 @@ -#red { - background-color: red; -} - -#green { - background-color: lime; -} - diff --git a/testsuite/reftests/alignment-props.ref.ui b/testsuite/reftests/alignment-props.ref.ui deleted file mode 100644 index 7f8c928531..0000000000 --- a/testsuite/reftests/alignment-props.ref.ui +++ /dev/null @@ -1,181 +0,0 @@ - - - - - False - popup - False - 300 - 200 - - - True - False - - - True - False - True - True - 0 - 0 - 0 - 0 - - - red - 30 - 30 - True - False - - - - - 0 - 0 - 1 - 1 - - - - - True - False - True - True - 0 - 0 - - - red - 30 - 30 - True - False - - - - - 1 - 0 - 1 - 1 - - - - - True - False - True - True - 1 - 1 - 0 - 0 - - - red - 30 - 30 - True - False - - - - - 2 - 0 - 1 - 1 - - - - - True - False - True - True - 0 - 0 - 10 - 30 - 20 - 40 - - - red - 30 - 30 - True - False - - - - - 0 - 1 - 1 - 1 - - - - - True - False - True - True - 10 - 30 - 20 - 40 - - - red - 30 - 30 - True - False - - - - - 1 - 1 - 1 - 1 - - - - - True - False - True - True - 1 - 1 - 10 - 30 - 20 - 40 - - - red - 30 - 30 - True - False - - - - - 2 - 1 - 1 - 1 - - - - - - diff --git a/testsuite/reftests/alignment-props.ui b/testsuite/reftests/alignment-props.ui deleted file mode 100644 index 08acf684b9..0000000000 --- a/testsuite/reftests/alignment-props.ui +++ /dev/null @@ -1,137 +0,0 @@ - - - - - False - popup - False - 300 - 200 - - - True - False - - - red - 30 - 30 - True - False - True - True - start - start - - - 0 - 0 - 1 - 1 - - - - - red - 30 - 30 - True - False - True - True - center - center - - - 1 - 0 - 1 - 1 - - - - - red - 30 - 30 - True - False - True - True - end - end - - - 2 - 0 - 1 - 1 - - - - - red - 30 - 30 - True - False - True - True - 10 - 30 - 20 - 40 - - - 0 - 1 - 1 - 1 - - - - - red - 30 - 30 - True - False - True - True - 10 - 30 - 20 - 40 - - - 1 - 1 - 1 - 1 - - - - - red - 30 - 30 - True - False - True - True - 10 - 30 - 20 - 40 - - - 2 - 1 - 1 - 1 - - - - - - diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui index 2a3f7a1cac..0c10ae54c5 100644 --- a/testsuite/reftests/inherit-and-initial.ref.ui +++ b/testsuite/reftests/inherit-and-initial.ref.ui @@ -1489,11 +1489,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 in - + inherit True False - 12 + 12 @@ -1523,11 +1523,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 out - + inherit True False - 12 + 12 @@ -1556,11 +1556,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False 0 - + inherit True False - 12 + 12 @@ -1590,11 +1590,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 etched-out - + inherit True False - 12 + 12 diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui index f8aa6af49e..4175473d02 100644 --- a/testsuite/reftests/inherit-and-initial.ui +++ b/testsuite/reftests/inherit-and-initial.ui @@ -1380,10 +1380,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 in - + True False - 12 + 12 @@ -1411,10 +1411,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 out - + True False - 12 + 12 @@ -1441,10 +1441,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False 0 - + True False - 12 + 12 @@ -1472,10 +1472,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 etched-out - + True False - 12 + 12 -- 2.30.2